Organize workspace

Add a bit of new tests and rearrange packages for better usability