Refactored Generator, Removed Tests project

Generator: Refactored, added Unit Tests
Tests: Removed