Refactored project modules