Abstracting folders to groups and more inline documentation