Removed Gin and started refactoring for new structure.