Change file structure. Add Web Cam compatability