Removed api folder (that should probably be a different branc), updated main script