restructured to module & test
restructured to module & test - removed monolith