Major refactoring. Removing demo application from Architect core.