renamed files to avoid overwriting of keywords
renaming to avoid confusion
added test project