directories and naming conventions for scripts tweaked