Changing Base Layout of application to be moduler