Reorganize package structure to accommodate Go code structure