Here goes nothing

Not sure what these commits are doing, possibly moving classes