Start refactoring of project spinner