1)Reformatted code according to http://ellislab.com/codeigniter/user-guide/general/styleguide.html
2)Fixed some remaining wrong file locations (.../modules/...)