Added Events folder to improve code structure