Changed packages and classes names