1.6

Code+dir cleanup