Changed directory and file structure