Duplicate files removed and minor changes to directory structure