Remove the silly nested class and add ability to load with a dict directly from the constructor.