Moved stuff into more sensible directory structure.