File reorganisation in prep for self hosting