Added blackmamba support and changed the package structure