Move and updated classes to work nicely together