Updating files to match new organisation