Adopt camel case naming convention for filenames of class source files
Move nested class into their own source files