Organized stuff
sln stuff
builds again