Added validation and organized project imports