Cleanup : Reorganized package structure