Reorganise File structure

Lets all try to keep it nice and tidy m'kay.