Refactored source files for better project organization.