Refactoring partial structure; Replacing neat library with singularity.