Restructure - move everything under a solution