Code restructuration

New folders, functions break into individual file, fix for help
generation