Fix code style and file organization
[skip ci]