renamed ths classes and the layouts