Fixed tabs and changed header files location