Directory structure modification
Added helper classes