removed render
added some files
some refactoring