moved some stuff around
made sure csproj file is up to date