Organize some classes and packages