Refactored project sources