Sorted classes
some fixes
added .gitignore