Another big refactoring to make you happy (or not =P)

Moving things to a better, but perhaps not the best, location