renamed classes and manifest file