Project package restructure.