Change package structure to facilitate different modules