Updated file structure & files