Move install step into separate classes