cleanup and composer
move frameworks around
comment typo