Fixing folder structure and wiring up the augular logic/views.