Added rest and refactored project