-- Changed paths of a few files for better modularity