reorganized fabfiles, added clusters table, starting working on user integration, some little fixes too