restructure; lib => src