Fixed function pointer syntax
Moving files to according dirs