Minor datatype tweaks.
Added Expression classes to filter and sort, likewise to map. Changed the folder structure a bit and updated the unit tests.