rename v2
cleanup
refactoring, live site