Rewrote includes

Rewrote includes to allow current files to work as originally designed in
new file architecture.