Reorganize; Basic API Working