Split files and added comments