Reorganize packages and classes