Update to Configuration

Move to subfolder, added abstract class structure, removed redundancy.