Restructure and added camera