Major upgrade to file url structure

Major upgrade to file url structure so it works more effeciently.