Updated file structure further