Some fixes to directory structure