New structure.

Removed unnecessary stuff. Essentially started anew.