some work on directories structure
re-factored main menu contruction