Reorganizing project and getting basic functionality.