Align array values

Updated pull request for new directory structure