Version 1.1

A quick code organization update.