and move bitfileds around and name enum typedefs better