change file names
Add doxygen style comments
Merge branch 'dev'