Added field matching classes, cleaned up old splash, renamed folders

#885