Reordered file structure, tweaked some small things.