refactor socorro into a project