Major restructuring and architecture update