removed apc and changed repo strucutre