Project and code reorganization