Corrected project build order and dependencies