change naming conventions again, write a couple tests, rewrite much of project configuration