Organized imports and moved todo items to todo.txt.
Refactoring plus work on bit fields.