Removed the flat file structure