Adjusted namespace
Adding Npcs WIP