Changes to folder structure; mobiboots fix