Package re-organization and rename of Servlets to Controllers