commit03282014

Made basic structural changes.