Reworked the directory structure. Progress. Yeah.