Refactored class paths to match conventions