Fixed NameSpaces, folder, and solution naming! Please update before work