Moved activities and fragments to controller package