project structure and song collection changes