Moving files around, getting ready for more contributed code.