Removing from top-level and restructuring directory.
Initial commit into new architecture.