Major refactoring of the directory structure