(chore) Reorganized and cleaned up a bit