renamed classes and added specs