Cleaning
Refactor
remove some unused dirs
Fix new build system