Changed up directory structure.