Reworked directory structure and changed a few file names