move to ui folder
Add container classes