restructure for mongo and initial angular work