Class auto loading and filename restructuring.
(Renamed files)