added some shortcuts, data headers, and moved stuff into directories