/Lennart/ cleanup

main folder cleanup

(All deleted files are backed up)