Clean up and changing laying layout to leverage modules
refactor and fixes 0.1.8