Restructured include directory
Deleted old tlm_2 directories