Refractor to new package (again)
Rename API file
Clean up everything