Big refactor of directories