Added new file structure