Updates for imports, consolidated apps

Less redundancy.