Refactored packages and reordered classes