refactoring and added renderer
changed folders
merge branch 'master'