Update fixes missnamed Callisto folder (thank you @francisdrake for the pickup), and better folder architecture.
