cleanup and structuring files
more cleanup