Organizing after moving to neobundle