Changing file structure to simplify compilation