Restructuring project: adding skeleton