Removed refrences to layout, adjusted directory structure