Restructured project (again) and improved deployment