Update directory structure to match the latest component organization