File structure reorganise

NOTE: THIS BRANCH IS UNFUNCTIONAL AND WILL REMAIN SO UNTIL FIXED AND
MERGED