Changed the directory structure