Code organization

Added option through argv