minor bug fixes and changes in project structure