folder restructering
fix class name type
various fixes; self != Java static this
further fixes; remove unused imports
Merge branch 'feature/refactoring' into develop