application structure reorganization