General code cleanup
Planned test structure, for API and REST