cleanup naming and directory layout.