Reorganize main package structure per discussion