[#4, #5] Cleanup, change file names