Changing file structure and various changes