Restructured packages and added lib for camera