renamed files and code accordingly
minor code refactoring and commenting