Restructure

Check out these changes, blueprints are overkill come to find out.  (read: I was wrong)