Changed directory file structure