started refractoring for cleaner separation of apps