You mention your project is still small - perhaps it would be easiest to start a new project and slowly add your code over to the new project?
You mention your project is still small - perhaps it would be easiest to start a new project and slowly add your code over to the new project?