Refactoring project

Removing deprecated classes, creating new base for new architecture