License headers and first steps towards inner class support