Separate files + put message feedback