Split the code in different files and remove several global using in headers