restructure

restructuring the application w.r.t to Erick comments.