#46 rename files to better classify functionality