Version 0.4.2 - rearranging folders, updating documentation

This needs to be tested more thoroughly but it appears to work.