Moved files and folders around to reflect areas of functionality.