Rearranged directories and added nuget tools