removed file for rename
refactring and bugfixes