Refactored package structure in main project