fix file layout
fix
rename method