Updated file structure again