Refactorings

Cleaning up old repository..