simplifying file structure