Refactor & standardize project package structure