Deletes deprecated files, refactoring process started.
Merge pull request #41 from rawrin/refactor

Deletes deprecated files, refactoring process started.