removed bin and gen files
small refactorings