Moved files around, simplifying structure. Hopefully few problems.