Moved ui elements to more effective folders.