renamed some files and unified coding conventions