[INTERNAL] Rename files, split files, cleanup
[TEST] add tests