cleanup old style crap
add new files in