fixing class and modules names and structure, updating rakefile