Organize

Organize basments api