changed project structure and updated reference paths