Fixing some naming conventions, moving things around, adding svn keywords