Merge

1. Merging the main version with Padhraic's version
2. Changing file's names