remove comment and files
bugfixed
remove factory
Refactaring
rename
Rename
change namespace