Merged everything into one folder, still have to merge the unit tests over