rearranged the file structure to so it hopefully makes more sense from an includes perspective and makes it easier to find the code.