Improved organization and shell script