Major refactoring of entire plist project.