created more stable implementation of syntax using regex, removed redundant files