Moved the activities into a 'ui' namespace
Cleaned up imports