start working with includes
reorganize the includes
fix some issues
remove console