Moved test classes & stories to correct package