Remove bad old code
Move files
Move files
Merge branch 'master' of https://github.com/luongm/ptc_spring13