added vcharge test and refactored folder.