Folder restructure

This is for #18 and it works for vagrant, however I don't think it will work with a remote server yet.