fixing groups specs and moving factories