Moved master directory back to common to allow for a smooth upgrade