some logging added
moved to subfolder