General cleanup and renamed root module to base.