Redid the file structure,  things now make a bit more sense