Basic tests added; clean-up and restructuring of directories