Changing file structure to allow for setup changes later