Omni starts now

Huge source cleanup/housekeeping.

Signed-off-by: zeroblade1984 <zeroblade1984@gmail.com>