Restructured directories for a more consistent structure.