refactored files for organization