Last Commit under the Enchant Insanity Name. Rewriting into a modular structure