ADDED: Modularized code and Desktop Application