Moved Conversions to util package
Moved classes to better packages
Cleaned up POM and tests
Used DI to build actions