Moving to module dir but disliking the single purposed-ness