First commit Refactored, changed some routes ... etc.