Fixing up some of the routing on the system to a more simplfied manner. It makes assumptions as to where files are placed.