Fixing api urls, cleaning up directories