Added prefix, modified directory structure