Code formatting, project structure changes
Bug fixes