Add new package structure for a more organised code