Reorganize headers
Test: Use signed type for acceleration