reworked some of the base files, locations and such