updating files to work correctly with our structure.