Refactored class names
Reorganized file structure
Fixed page rendering