Update: logs folder now included; Minor refactoring