Cleaned up the demo directory structure