lib folder structure
dry up file requirements
remove double splat