cleaned up project and structured like a larger app.