Updating for Collections. (Patreon)

Taking some time to move things into the new collections system for better organization. Got the main stuff sorted but there is plenty more to decide how to organize