Start of data logging

Also cleaned up folder structure.