rearrange file locations
Move around more files
Change the arthur-dev hierarchy