NB: Original repo deleted and one with the correct structure created.

This commit represents that new structure and some packages were renamed and code updated.