Tidying up the Bare Metal projects