Moved some code around to make it more readable (no real Change)
Assembly info changes