Project files adjustments + code improvements.