got rid of wrapping
various changes, moved into a folder