major organization update, pruning, uniformizing prototypes