rename folder and adjust coding style