Complete restructure

Added repositories for common name highlighting.
Added keyword support for A-P
Trash me please