Moved things around, fixed configs