re-structuring
re-structuring packages
re-structure + first working integration test
re-structure + first working integration test