np -> numpy, cleanup of __init__ files