(WIP) move around the headers and add some

 *this is to simplify the setting making it easier to find things.

Signed-off-by: baked <travp624@gmail.com>