merge to core app archiecture