Fixed it so the API is not dependent on the main source again.
Added @author MineMaarten where needed