Swapped src files with the versions handed in
Added a couple of loose files