Package Reorganization, Remove all the useless things