Changed dependencies to simplify.
Final rearrange & cleanup dependencies.
Version bump