fixed koding silliness, renamed some files