Further modifed file structure