massive cleanup and move to github generated layout