go for consistent naming, passing tests
remove old files