Fix naming + package structure