Reorganizing, renamings (not happy yet, anyways), configuration stuff