Rearrange of the file locations and upgrades to the code