Updated file structure and renamed some things.