Move some classes and packages for correct project struckture