Refactored project... Again