cleanup

moving stuff around and cleaning up code
more cleanup

updated project
modernized objective c