Modifications to directory structure. Modified to remove dependency on external files.