restructure application structures
moved everything into application