Combine into a single file
Fix smalls issue