Changed directory layout.
Updated blacklist.