Completely redid directory structure