Tried out moving these to included Modules and it seems to just make things feel hidden. Not sure I like moving the stuff out to a mysterious place.