Got API to function, updated file structure.