Tidying Hardware folder structure.