some headers cleanup try to not include headers from headers, and remove some redundant include. This helps in modularizing the codebase and also helps during incremental compilations.

move all the sources back in the root directory subdir is just messier for no good reason