Added ACP module, and officially moved to a proper fork

The situation was getting a little schizophrenic