Reorganize directory structure
Update paths for new directory structure