Cleaner directory structure, moving things around to start the framework port.