first dev commit
remove old classes
Merge pull request #1 from barif/dev

Dev