Moved and renamed classes to fit standard