17-year-olds to be moved to youth justice