Restructuring

Redid package structure