Cleaning up directory, removing painful naming conventions