Better file structure + cmp.lock file