Refactoring

Ready to dev!