Reorganized directories, filenames, module/class names