More cleaning

Spruced up directories, updated uml