Added some more structure and bones of the code
Added more structure