Rename initializers to assure proper ordering
Move the basedir reset to the beginning