Some changes to directory structure