Fixed the messed up directory structure