Add: error handling & messages
Improvement: Restructure file organization