Add nose support for testing and refactored Makefile
move files around
Merged run.py and app.py