huge refactor of package names. one for each contributor