Merge pull request #1 from thunder-/develop

reworked some of the base files, locations and such