Restructure (create seperate syntax modules) and addition of some syntax