added client helper
restructured directories
work in progress