Lots of renaming
Moar renaming and added ApiTest project
Added more testing  libraries and code.