A few package moves in test to match the prod layout
Made ids final val
Moved package
Improve readme