Work

- Moved project into subfolder to make space for unit test project
- Added more wrappings, improved old ones