code organization

BAM BAM BAM