Major refactoring: Bash files integrated in a single bashrc