Refactored project due to the new requirements
Merget with master