Corrected naming and moved demo code to subfolder