Update 03.09.2013
Update some names and file structure