clean up file structure
revert accidental deletion
add Leap functionality