LQE-115: Changed project structure
LQE-115: Changed project structure