tidy up lint suggestions
restructure project slightly
fix file names