some fixes to the directory structure