removed deprecation warnings; support for class dirs