renamed classes to reflect proper pattern model
renamed classes to reflect proper pattern model