restructured, fixed test capability, remove thesis