restructured application
restructured application
still working on refactor