Add collections and remote connectivity
Remove wrong modules