global-fixed path correction, renamed a few files, and reorganized structure to make slightly more sense