Merged into ember and added directory structure

I merged hswolff's commit and added directory structure