Added AngelMakerConfig, removed unused classes

Some general cleanup / improvements