Update directory structure, use Make instead of phing