Testing is working, and directory structure updated.