added foldercontroller + test
spaces to tabs
added annotations test