modified directory structure
modified files to support new folder structure
modified files to support new folder structure
fixed simple test
added channels structure