Moved Acore stuff to the proper package