Initial package struct
Initial package struct fix
Added database package