Some refactorings.
Unnecessary files removed.