Moved activites back into respective packages