Renamed files and classed
Merge branch 'master' of github.com:eugenk/awe