Restructured folder hierarchy

Cleaner, clearer.