move all the omgwtf stuff in to its own package