Redesigned package structure and fixed dependencies