add description to merge requests
cleanup and simplify ui
new folders and nested files