Re-org project directories