more camera changes and restructure