renamed/moved some layout files