Improved bounding of dataframe selections; re-organized files a bit