Fixing project structure and content fixes after discussion on 27.03.2014