refactoring shell scripts and directory structure (still wip)