cleaning, refactoring, adding missing classes, attr, ..
Merge pull request #1 from garlic/feature/fixing_refactoring

cleaning, refactoring, adding missing classes, attr, ..