Proper Solution structure

Changed folder location to the proper