Re-structured the file hiearchy to match the one on the demo code