Updated directory structure, function definitions are now parsed
correctly