Comments & rearrange lib folder