V1.2 - After Martin chat

All excess files removed, no header files adjusted only removed wasteful
relationships