fixed up datadir references, copyright info and simplified imports.