renamed some files, got rid of unnecessary files