CHECKPOINT
Restructured based on angular example app. Much more progress on UI