restructure
Restructure preparing for cmake conversion