Re-organize the void

Based on crDroids changes just went a lil further by adding my odds and
ends section
creds cristianomatos and team