minor changes in project structure, minor fixes