Directory structure

Some changes to the directory structure…