Moving base directory finished (closes #31)