Refactored package structure to be flatter