remove some files, layout refactored