New structure

Trying out a new and more complete structure and stuff.