Restructured project package structure