Initial stab: organised package structure