remove modules and generic directory
fix some indendation