Moved some API files and renamed a few.
Finished cleanup!WOO HOO!