Directory structure

Still fumbling with the structure