Fixing the package structure. Test able to run. Still some work in progress