Rearranged the code base to make way for the new code, I still wanted to have the old code for reference though.