TuteData Refactored
Project is ready for testing