Cleaned up structuring of ui files.