move cpp files up one dir
fix includes, fix test
fix path in setup
Merge pull request #41 from kjs73/move_cpp_files

Move cpp files
start adding test
resolve conflict, empty lines
fix takestep test