07/09/2013: Some fixes in project structure and in code