Organize Project better, moved helper files to utils directory