Moved UI classes to separate folder and namespace