Added MrMarsh Solution and changed package structure to support all
problem sites