and even more refactoring of directories, etc.