reorganize into "app" concept