Extracted classes, organized files