Moved some code files around, more development.