Added testing. Renamed directories to match package.