Keeping separate directories for all of these files isn't the most obvious way to do things. Instead, move everything into the same directory. Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>