renamed classes and layout files