Refactored subpackages into main package
Fixed CI tests