Refactoring renderer
Changing package name
Update TODO.txt