move to a more standard dir structure