removed some unnecessary files, renamed some things, cleaned up