Changed around some small things so calc gets pulled from it's own crate

Created by: mgmoens

I think the code speaks for itself I guess? Don't know if this was reserved, if it's not the right moment please just discard this. Also, is it me or has Cargo.lock been removed from the .gitignore?