Restructured folders... let's try this again.